New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add hash to end of resource names to avoid name clash #605

Merged

openshift-merge-bot merged 1 commit into project-codeflare:main from KPostOffice:secret-clash-10129

Sep 3, 2024

Collaborator

KPostOffice commented Aug 6, 2024

Issue link

https://issues.redhat.com/browse/RHOAIENG-10129

What changes have been made

created a function which takes a string and appends the controller name to it then hashes it to use as a suffix for the resources created by this controller to avoid naming conflicts

Verification steps

Checks

I've made sure the tests are passing.
Testing Strategy
- Unit tests
- Manual tests
- Testing is not required for this change

openshift-ci bot added the do-not-merge/work-in-progress label

astefanutti reviewed

View reviewed changes

Contributor

astefanutti left a comment

Ideally the existing resources should be pruned, like during the operator upgrade. But I think that's acceptable.

pkg/controllers/raycluster_controller.go Outdated Show resolved Hide resolved

pkg/controllers/support.go Outdated Show resolved Hide resolved

Collaborator Author

KPostOffice commented Aug 7, 2024

Ideally the existing resources should be pruned, like during the operator upgrade. But I think that's acceptable.

I had this thought too. I can try my hand at writing an upgrade strategy for this

openshift-merge-robot added the needs-rebase label

KPostOffice force-pushed the secret-clash-10129 branch from fa02c39 to b37b3bd Compare

August 8, 2024 20:44

openshift-merge-robot removed the needs-rebase label

KPostOffice force-pushed the secret-clash-10129 branch from b37b3bd to ffbf30a Compare

August 19, 2024 15:26

astefanutti reviewed

View reviewed changes

pkg/controllers/raycluster_controller.go Outdated Show resolved Hide resolved

astefanutti reviewed

View reviewed changes

pkg/controllers/raycluster_controller.go Outdated Show resolved Hide resolved

KPostOffice force-pushed the secret-clash-10129 branch 5 times, most recently from 42f243e to 33855ed Compare

August 20, 2024 22:03

astefanutti reviewed

View reviewed changes

pkg/controllers/support.go Outdated Show resolved Hide resolved

Contributor

astefanutti commented Aug 21, 2024

I guess the new names should be reflected into Ray cluster the webhook.

Contributor

astefanutti commented Aug 21, 2024

Overall LGTM, just left a comment on the hash seed, and to update the Ray cluster webhook accordingly.

KPostOffice marked this pull request as ready for review

August 21, 2024 15:17

openshift-ci bot removed the do-not-merge/work-in-progress label

openshift-ci bot requested review from ChristianZaccaria and dimakis

August 21, 2024 15:17

KPostOffice force-pushed the secret-clash-10129 branch from 33855ed to 19269cb Compare

August 21, 2024 15:33

Collaborator Author

KPostOffice commented Aug 21, 2024

I guess the new names should be reflected into Ray cluster the webhook.

I think this is taken care of already by using the nameFromCluster functions in all the necessary places.

KPostOffice force-pushed the secret-clash-10129 branch from 19269cb to 1f8e331 Compare

August 21, 2024 16:03

Contributor

astefanutti commented Aug 21, 2024

I guess the new names should be reflected into Ray cluster the webhook.

I think this is taken care of already by using the nameFromCluster functions in all the necessary places.

Ah OK, I thought it could explain why the e2e failed.

KPostOffice force-pushed the secret-clash-10129 branch from 1f8e331 to 0d7b8be Compare

August 21, 2024 16:28

Collaborator Author

KPostOffice commented Aug 21, 2024

I guess the new names should be reflected into Ray cluster the webhook.

I think this is taken care of already by using the nameFromCluster functions in all the necessary places.

Ah OK, I thought it could explain why the e2e failed.

The tests also needed to be changed to use the fromCluster functions. I'm still messing around with them. I thought I caught everything but I'm still clearly missing something that needs to be fixed in the tests

KPostOffice force-pushed the secret-clash-10129 branch 3 times, most recently from 42d9a82 to d9f9150 Compare

August 21, 2024 20:07

KPostOffice force-pushed the secret-clash-10129 branch 2 times, most recently from 5dd4666 to b1a1fda Compare

August 22, 2024 20:16

Collaborator Author

KPostOffice commented Aug 22, 2024

@astefanutti This should be g2g now

astefanutti reviewed

View reviewed changes

pkg/controllers/raycluster_controller.go Outdated Show resolved Hide resolved

KPostOffice force-pushed the secret-clash-10129 branch 2 times, most recently from 2b020b4 to eff323b Compare

August 26, 2024 17:10

astefanutti reviewed

View reviewed changes

pkg/controllers/raycluster_webhook.go Outdated Show resolved Hide resolved

KPostOffice force-pushed the secret-clash-10129 branch 2 times, most recently from 70f4778 to 4d57ade Compare

August 26, 2024 21:00

sutaakar reviewed

View reviewed changes

pkg/controllers/raycluster_webhook.go Outdated Show resolved Hide resolved

sutaakar reviewed

View reviewed changes

pkg/controllers/raycluster_webhook_test.go Outdated

Comment on lines 49 to 51

+              			Annotations: map[string]string{
+              				versionAnnotation: "0.0.0",
+              			},

Contributor

sutaakar Aug 27, 2024 •

edited

Loading

Can you remove this annotation from here?
RayCluster CR created by used or SDK won't have the annotation defined. To reproduce the behavior we shouldn't provide it here either.

sutaakar reviewed

View reviewed changes

pkg/controllers/raycluster_webhook_test.go Outdated

		@@ -46,6 +46,9 @@ func TestRayClusterWebhookDefault(t *testing.T) {
		ObjectMeta: metav1.ObjectMeta{

Contributor

sutaakar Aug 27, 2024

Can you set operator version into rcWebhook above?

sutaakar reviewed

View reviewed changes

pkg/controllers/raycluster_webhook_test.go Outdated Show resolved Hide resolved

sutaakar reviewed

View reviewed changes

pkg/controllers/raycluster_webhook_test.go

+              			},
+              		},
+              		Spec: rayv1.RayClusterSpec{},
+              	}
               	validRayCluster := &rayv1.RayCluster{

Contributor

sutaakar Aug 27, 2024 •

edited

Loading

no action comment
Using annotation and functions for validRayCluster is correct as those values are set by default webhook.

sutaakar reviewed

View reviewed changes

pkg/controllers/raycluster_webhook_test.go Show resolved Hide resolved

astefanutti reviewed

View reviewed changes

pkg/controllers/raycluster_webhook.go Outdated Show resolved Hide resolved

astefanutti reviewed

View reviewed changes

pkg/controllers/raycluster_controller.go Outdated Show resolved Hide resolved


          add hash to end of resource names to avoid name clash

cbd36e5

also added a version annotation to raycluster for the CFO version

Signed-off-by: Kevin <[email protected]>

KPostOffice force-pushed the secret-clash-10129 branch from 4d57ade to cbd36e5 Compare

August 28, 2024 17:19

sutaakar reviewed

View reviewed changes

Contributor

sutaakar left a comment

/lgtm

openshift-ci bot assigned sutaakar

openshift-ci bot added the lgtm label

astefanutti approved these changes

View reviewed changes

openshift-ci bot assigned astefanutti

openshift-ci bot commented Sep 3, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: astefanutti

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [astefanutti]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci bot added the approved label

openshift-merge-bot bot merged commit 7f00118 into project-codeflare:main

8 checks passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels